From 59e095918657d83ee73d5d3c67844bec9a4b5b5d Mon Sep 17 00:00:00 2001
From: nana-4 <hnmaigo@gmail.com>
Date: Wed, 26 Aug 2020 00:09:45 +0900
Subject: [PATCH] Adwaita: Add border-spacing to some container widgets and
 style classes

This commit adds border-spacing to actionbar, searchbar, .toolbar and
.app-notification, so their child widgets won't appear to be connected
even without margin.
---
 gtk/theme/Adwaita/_common.scss | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 1d732c984f..8bf1a6ed4e 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -1294,6 +1294,7 @@ combobox {
  ************/
 %toolbar {
   padding: 4px;
+  border-spacing: 4px;
   background-color: $bg_color;
 }
 
@@ -1301,8 +1302,6 @@ combobox {
 toolbar {
   @extend %toolbar;
 
-  padding: 4px 3px 3px 4px;
-
   // on OSD
   .osd & { background-color: transparent; }
 
@@ -1320,21 +1319,19 @@ toolbar {
   }
 
   // toolbar separators
-  &.horizontal separator { margin: 0 7px 1px 6px; }
-  &.vertical separator { margin: 6px 1px 7px 0; }
+  &.horizontal > separator { margin: 4px 0; }
+  &.vertical > separator { margin: 0 4px; }
 }
 
 //searchbar & location-bar
-searchbar {
-  padding: 0px;
-  >revealer>box {
-    padding: 6px;
-    @extend %toolbar;
+searchbar > revealer > box {
+  padding: 6px;
+  border-spacing: 6px;
+  @extend %toolbar;
 
-    @extend %darkbar;
+  @extend %darkbar;
 
-    border-width: 0 0 1px;
-  }
+  border-width: 0 0 1px;
 }
 
 %darkbar {
@@ -3017,8 +3014,9 @@ frame {
   }
 }
 
-actionbar > revealer >  box {
+actionbar > revealer > box {
   padding: 6px;
+  border-spacing: 6px;
   border-top: 1px solid $borders_color;
 }
 
@@ -3165,11 +3163,11 @@ row {
 /*********************
  * App Notifications *
  *********************/
-.app-notification,
-.app-notification.frame {
+.app-notification {
   @extend %osd;
 
   padding: 10px;
+  border-spacing: 10px;
   border-radius: 0 0 5px 5px;
   background-color: $osd_bg_color;
   background-image: linear-gradient(to bottom, transparentize(black, 0.8),
-- 
2.30.2